xsm: Correct the usage of XSM_ENABLE after c/s 20285.

Signed-off-by : Machon Gregory <mbgrego@tycho.ncsc.mil>

diff --git a/xen/xsm/Makefile b/xen/xsm/Makefile
index 725f98e3776767fc1b5fb380861485e3fee23f6c..02f55d8e1afb2e254603858b06828d2458475c43 100644 (file)
--- a/xen/xsm/Makefile
+++ b/xen/xsm/Makefile
@@ -1,6 +1,6 @@
 obj-y += xsm_core.o
-obj-y += xsm_policy.o
 ifeq ($(XSM_ENABLE),y)
+obj-y += xsm_policy.o
 obj-y += dummy.o
 endif
 

diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
index f1e8bd27ceb63b43188eaec80070501cc595ae21..2919c1a6996caf0bcd2d2ef5adeecd89d4a75ce5 100644 (file)
--- a/xen/xsm/xsm_policy.c
+++ b/xen/xsm/xsm_policy.c
@@ -19,7 +19,6 @@
  *
  */
 
-#define XSM_ENABLE
 #include <xsm/xsm.h>
 #include <xen/multiboot.h>